Skip to content

Add feature "22_0" for bitcoin 22.0 #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Sep 20, 2021
Merged

Add feature "22_0" for bitcoin 22.0 #30

merged 2 commits into from
Sep 20, 2021

Conversation

notmandatory
Copy link
Contributor

No description provided.

@notmandatory notmandatory mentioned this pull request Sep 14, 2021
Merged
@notmandatory notmandatory mentioned this pull request Sep 14, 2021
Merged
4 tasks
notmandatory
notmandatory commented Sep 14, 2021
View reviewed changes
src/lib.rs Outdated
@@ -92,7 +91,6 @@ const LOCAL_IP: Ipv4Addr = Ipv4Addr::new(127, 0, 0, 1);
/// assert_eq!(conf, bitcoind::Conf::default());
/// ```
///
#[non_exhaustive]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had to remove this because it prevents external crates (like electrsd) from being able to create a Conf.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's the entire point :)

users should use let conf = Conf::default() and then change the relative fields

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah ha! ok I removed this change.

@notmandatory notmandatory mentioned this pull request Sep 14, 2021
Merged
@RCasatta
Copy link
Collaborator

RCasatta commented Sep 14, 2021 •
edited
Loading

I am not seeing version 22.0 published on https://bitcoin.org/bin/ at the moment

looking in wrong place... https://bitcoincore.org/bin/bitcoin-core-22.0/

RCasatta
RCasatta reviewed Sep 14, 2021
View reviewed changes
build.rs
@@ -19,7 +19,19 @@ fn download_filename() -> String {
}

fn get_expected_sha256(filename: &str) -> Result<sha256::Hash, ()> {
let sha256sums_filename = format!("sha256/bitcoin-core-{}-SHA256SUMS.asc", &VERSION);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we use the .asc version also for 22.0?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I couldn't decide about this, starting with 22.0 two files are created: SHA256SUMS and SHA256SUMS.asc. The first file has all the checksums and the second file only has signatures. Two other options I see are:

  1. for all new releases of bitcoind we rename the SHA256SUMS file to SHA256SUMS.asc, but usually the .asc extension means that it's ascii armored which the new release files technically won't be.
  2. we rename all the files in the sha256 directory, removing the .asc extension and we should also remove the signatures so the file names won't be misleading and since we don't use the signatures anyway.

Disadvantage of options 1 is some misleading file naming that conflict with actual files released with that name. I'd prefer option 2 since going forward for new releases we can just rename and drop in the unedited SHA256SUMS file.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I didn't know the SHA256SUMS.asc format changed... Let's keep it as it is in current PR

@notmandatory notmandatory marked this pull request as ready for review September 15, 2021 20:36
@notmandatory notmandatory marked this pull request as draft September 16, 2021 19:46
@notmandatory
Copy link
Contributor Author

Leaving this PR as draft until new core-rpc is released with RCasatta/rust-bitcoincore-rpc#2 so I can update Cargo.toml.

@RCasatta
Copy link
Collaborator

just pushed core-rpc 0.15

@notmandatory notmandatory marked this pull request as ready for review September 17, 2021 16:41
@RCasatta
Copy link
Collaborator

I've got some errors testing locally because the core-rpc create_wallet method changed, and I am afraid the CI didn't previously run (now you can see the CI because I pushed your commit on another branch, but it wasn't there when you pushed) because there wasn't on: pull_request but now I added 83cf6c8 on master.

Could you please rebase on master so that CI is run and fix the errors?

@notmandatory
Copy link
Contributor Author

Thanks, I should have tested it manually. I've re-based, made the required changes for core-rpc 0.15 and the tests are passing now.

@RCasatta
Copy link
Collaborator

LGTM

@RCasatta RCasatta merged commit de229b2 into rust-bitcoin:master Sep 20, 2021
@RCasatta
Copy link
Collaborator

released 0.19.0

@notmandatory notmandatory deleted the add_bitcoin_22_0 branch September 20, 2021 20:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RCasatta RCasatta RCasatta left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@notmandatory @RCasatta